From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 13 Apr 2011 23:38:13 +0000 (-0700)
Subject: * fringe.c (standard_bitmaps): Now static.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4132^2~35
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bb36b9ecb3c4bc14660d0eab5777f3087801baa8;p=emacs.git

* fringe.c (standard_bitmaps): Now static.

(max_used_fringe_bitmap): Now static, unless HAVE_NS.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a376be9f13..031bf70d2a8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* fringe.c (standard_bitmaps): Now static.
+	(max_used_fringe_bitmap): Now static, unless HAVE_NS.
+
 	* frame.c: Make symbols static if they're not exported.
 	(x_report_frame_params, make_terminal_frame): Now static.
 	(get_frame_param): Now static, unless HAVE_NS.
diff --git a/src/fringe.c b/src/fringe.c
index 281b563c9b7..bc6b493584c 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -427,7 +427,7 @@ static unsigned short empty_line_bits[] = {
 /* NOTE:  The order of these bitmaps must match the sequence
    used in fringe.el to define the corresponding symbols.  */
 
-struct fringe_bitmap standard_bitmaps[] =
+static struct fringe_bitmap standard_bitmaps[] =
 {
   { NULL, 0, 0, 0, 0, 0 }, /* NO_FRINGE_BITMAP */
   { FRBITS (question_mark_bits),      8, 0, ALIGN_BITMAP_CENTER, 0 },
@@ -462,6 +462,9 @@ static struct fringe_bitmap **fringe_bitmaps;
 static Lisp_Object *fringe_faces;
 static int max_fringe_bitmaps;
 
+#ifndef HAVE_NS
+static
+#endif
 int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS;